From 720ee14d2092497f51f055426ba3039e8406baec Mon Sep 17 00:00:00 2001 From: oliskoli Date: Mon, 22 Sep 2008 20:54:52 +0000 Subject: [PATCH] nmea: Make 'had_checksum' global for the reader. Change reference data. --- nmea.c | 3 ++- reference/track/amod-cleansed | 2 -- reference/track/amod.gpx | 18 ------------------ 3 files changed, 2 insertions(+), 21 deletions(-) diff --git a/nmea.c b/nmea.c index 200ce5469..60fc92a6d 100644 --- a/nmea.c +++ b/nmea.c @@ -183,6 +183,7 @@ static int amod_waypoint; static time_t last_time; static double last_read_time; /* Last timestamp of GGA or PRMC */ static int datum; +static int had_checksum; static waypoint * nmea_rd_posn(posn_status *); static void nmea_rd_posn_init(const char *fname); @@ -253,6 +254,7 @@ nmea_rd_init(const char *fname) last_waypt = NULL; last_time = -1; datum = DATUM_WGS84; + had_checksum = 0; CHECK_BOOL(opt_gprmc); CHECK_BOOL(opt_gpgga); @@ -858,7 +860,6 @@ nmea_fix_timestamps(route_head *track) void nmea_parse_one_line(char *ibuf) { - int had_checksum = 0; char *ck; int ckval, ckcmp; char *tbuf = lrtrim(ibuf); diff --git a/reference/track/amod-cleansed b/reference/track/amod-cleansed index 951b60977..c113e69b7 100644 --- a/reference/track/amod-cleansed +++ b/reference/track/amod-cleansed @@ -1,5 +1,3 @@ -$GPWPL,3549.499,N,08650.824,W,WPT001*31 -$GPWPL,3549.499,N,08650.824,W,WPT002*32 $GPRMC,200641.000,V,3549.499,N,08650.824,W,0.00,224.45,050608,,*03 $GPGGA,200641.000,3549.499,N,08650.824,W,0,00,0.0,0.000,M,0.0,M,,*74 $GPVTG,224.450,T,0,M,0.000,N,0.000,K*55 diff --git a/reference/track/amod.gpx b/reference/track/amod.gpx index 50271e306..f38d90d6e 100644 --- a/reference/track/amod.gpx +++ b/reference/track/amod.gpx @@ -7,24 +7,6 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/GPX/1/0/gpx.xsd"> - - - WPT001 - WPT001 - WPT001 - - - 269.900000 - - WPT002 - WPT002 - WPT002 - 3d - 6 - 1.300000 - 1.800000 - 2.200000 - -- 2.30.2